From 86c29e15439c044b828e87c816c9d13b348546ad Mon Sep 17 00:00:00 2001 From: "vh249@arcadians.cl.cam.ac.uk" Date: Sun, 21 Aug 2005 16:49:54 +0000 Subject: [PATCH] fix logic of ballooning out to handle the dom0_min_mem parameter correctly add an error message when having not enough memory Signed-off-by: Vincent Hanquez --- tools/python/xen/xm/create.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index 3770609df6..ec4ab49c12 100644 --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py @@ -688,7 +688,9 @@ def balloon_out(dom0_min_mem, opts): dom0_cur_alloc = get_dom0_alloc() dom0_new_alloc = dom0_cur_alloc - (domU_need_mem - free_mem) - if free_mem < domU_need_mem and dom0_new_alloc >= dom0_min_mem: + if free_mem < domU_need_mem and dom0_new_alloc < dom0_min_mem: + ret = 1 + if free_mem < domU_need_mem and ret == 0: server.xend_domain_mem_target_set(0, dom0_new_alloc) @@ -734,7 +736,8 @@ def main(argv): dom0_min_mem = xroot.get_dom0_min_mem() if dom0_min_mem != 0: if balloon_out(dom0_min_mem, opts): - return + print >>sys.stderr, "error: cannot allocate enough memory for domain" + sys.exit(1) dom = make_domain(opts, config) if opts.vals.console_autoconnect: -- 2.30.2